From 91aa2d9234ebcee442f69c0d39baae4730129128 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 10 Sep 2001 18:54:20 +0000 Subject: [PATCH] slight fix for g_object_set() not usable for nesting anymore. Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for g_object_set() not usable for nesting anymore. * gtk/gtkhandlebox.c (gtk_handle_box_class_init): * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow properties, supply ::shadow_type properties instead as most other widgets do. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkframe.c | 14 ++++++++++++-- gtk/gtkhandlebox.c | 14 ++++++++++++-- tests/testgtk.c | 44 +++++++++++++++++++++++--------------------- 10 files changed, 117 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 676db4a7cf..fef88189ee 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Mon Sep 10 20:47:22 2001 Tim Janik + + * tests/testgtk.c (create_idle_test): slight fix for + g_object_set() not usable for nesting anymore. + + * gtk/gtkhandlebox.c (gtk_handle_box_class_init): + * gtk/gtkframe.c (gtk_frame_class_init): deprecate ::shadow + properties, supply ::shadow_type properties instead as most + other widgets do. + 2001-09-10 Alex Larsson * demos/gtk-demo/stock_browser.c: diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 98dfc509a6..7efc069a52 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -38,6 +38,7 @@ enum { PROP_LABEL_XALIGN, PROP_LABEL_YALIGN, PROP_SHADOW, + PROP_SHADOW_TYPE, PROP_LABEL_WIDGET }; @@ -148,7 +149,14 @@ gtk_frame_class_init (GtkFrameClass *class) G_PARAM_WRITABLE)); g_object_class_install_property (gobject_class, PROP_SHADOW, - g_param_spec_enum ("shadow", + g_param_spec_enum ("shadow", NULL, + _("Deprecated property, use shadow_type instead."), + GTK_TYPE_SHADOW_TYPE, + GTK_SHADOW_ETCHED_IN, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, + PROP_SHADOW_TYPE, + g_param_spec_enum ("shadow_type", _("Frame shadow"), _("Appearance of the frame border."), GTK_TYPE_SHADOW_TYPE, @@ -206,6 +214,7 @@ gtk_frame_set_property (GObject *object, g_value_get_double (value)); break; case PROP_SHADOW: + case PROP_SHADOW_TYPE: gtk_frame_set_shadow_type (frame, g_value_get_enum (value)); break; case PROP_LABEL_WIDGET: @@ -239,6 +248,7 @@ gtk_frame_get_property (GObject *object, g_value_set_double (value, frame->label_yalign); break; case PROP_SHADOW: + case PROP_SHADOW_TYPE: g_value_set_enum (value, frame->shadow_type); break; case PROP_LABEL_WIDGET: @@ -453,7 +463,7 @@ gtk_frame_set_shadow_type (GtkFrame *frame, if ((GtkShadowType) frame->shadow_type != type) { frame->shadow_type = type; - g_object_notify (G_OBJECT (frame), "shadow"); + g_object_notify (G_OBJECT (frame), "shadow_type"); if (GTK_WIDGET_DRAWABLE (frame)) { diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 852a184040..3a773269bf 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -35,6 +35,7 @@ enum { PROP_0, PROP_SHADOW, + PROP_SHADOW_TYPE, PROP_HANDLE_POSITION, PROP_SNAP_EDGE }; @@ -179,7 +180,14 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) g_object_class_install_property (gobject_class, PROP_SHADOW, - g_param_spec_enum ("shadow", + g_param_spec_enum ("shadow", NULL, + _("Deprecated property, use shadow_type instead."), + GTK_TYPE_SHADOW_TYPE, + GTK_SHADOW_ETCHED_OUT, + G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_class_install_property (gobject_class, + PROP_SHADOW_TYPE, + g_param_spec_enum ("shadow_type", _("Shadow type"), _("Appearance of the shadow that surrounds the container."), GTK_TYPE_SHADOW_TYPE, @@ -269,6 +277,7 @@ gtk_handle_box_set_property (GObject *object, switch (prop_id) { case PROP_SHADOW: + case PROP_SHADOW_TYPE: gtk_handle_box_set_shadow_type (handle_box, g_value_get_enum (value)); break; case PROP_HANDLE_POSITION: @@ -294,6 +303,7 @@ gtk_handle_box_get_property (GObject *object, switch (prop_id) { case PROP_SHADOW: + case PROP_SHADOW_TYPE: g_value_set_enum (value, handle_box->shadow_type); break; case PROP_HANDLE_POSITION: @@ -733,7 +743,7 @@ gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box, if ((GtkShadowType) handle_box->shadow_type != type) { handle_box->shadow_type = type; - g_object_notify (G_OBJECT (handle_box), "shadow"); + g_object_notify (G_OBJECT (handle_box), "shadow_type"); gtk_widget_queue_resize (GTK_WIDGET (handle_box)); } } diff --git a/tests/testgtk.c b/tests/testgtk.c index 233a4b5c39..2d6e320729 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -10162,6 +10162,7 @@ create_idle_test (void) if (!window) { + GtkWidget *button2; GtkWidget *frame; GtkWidget *box; @@ -10211,27 +10212,28 @@ create_idle_test (void) NULL), "signal::clicked", toggle_idle_container, container, NULL); - button = - g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON, - "label", "Resize-Queue", - "user_data", (void*)GTK_RESIZE_QUEUE, - "group", button, - "visible", TRUE, - "parent", box, - NULL), - "signal::clicked", toggle_idle_container, container, - NULL); - button = - g_object_set (g_object_connect (gtk_widget_new (GTK_TYPE_RADIO_BUTTON, - "label", "Resize-Immediate", - "user_data", (void*)GTK_RESIZE_IMMEDIATE, - NULL), - "signal::clicked", toggle_idle_container, container, - NULL), - "group", button, - "visible", TRUE, - "parent", box, - NULL); + button = gtk_widget_new (GTK_TYPE_RADIO_BUTTON, + "label", "Resize-Queue", + "user_data", (void*)GTK_RESIZE_QUEUE, + "group", button, + "visible", TRUE, + "parent", box, + NULL); + g_object_connect (button, + "signal::clicked", toggle_idle_container, container, + NULL); + button2 = gtk_widget_new (GTK_TYPE_RADIO_BUTTON, + "label", "Resize-Immediate", + "user_data", (void*)GTK_RESIZE_IMMEDIATE, + NULL); + g_object_connect (button2, + "signal::clicked", toggle_idle_container, container, + NULL); + g_object_set (button2, + "group", button, + "visible", TRUE, + "parent", box, + NULL); button = gtk_button_new_with_label ("close"); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", -- 2.30.2